Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into master #556

Merged
merged 755 commits into from
Oct 19, 2020
Merged

Merge develop into master #556

merged 755 commits into from
Oct 19, 2020

Conversation

nkryuchkov
Copy link
Contributor

Release v0.3.0

nkryuchkov and others added 13 commits October 16, 2020 15:58
# Conflicts:
#	go.mod
#	go.sum
#	vendor/modules.txt
Improvements for configuring the VPN from the manager
# Conflicts:
#	cmd/hypervisor/statik/statik.go
#	cmd/setup-node/commands/root.go
#	cmd/skywire-visor/commands/root.go
#	go.mod
#	go.sum
#	static/skywire-manager-src/dist/index.html
#	static/skywire-manager-src/dist/main.c6b0794487fccceeaee4.js
#	static/skywire-manager-src/dist/polyfills-es5.02ea9ed361dcf6ed21de.js
#	static/skywire-manager-src/dist/polyfills.c7102ec52342ba24ce3d.js
#	vendor/github.com/gorilla/handlers/compress.go
#	vendor/github.com/gorilla/handlers/go.mod
#	vendor/github.com/gorilla/handlers/handlers.go
#	vendor/github.com/gorilla/handlers/logging.go
#	vendor/github.com/gorilla/handlers/recovery.go
#	vendor/github.com/pkg/errors/go.sum
#	vendor/github.com/skycoin/dmsg/go.mod
#	vendor/github.com/skycoin/dmsg/go.sum
#	vendor/github.com/tjfoc/gmsm/LICENSE
#	vendor/golang.org/x/sys/unix/mkerrors.sh
#	vendor/golang.org/x/sys/unix/syscall_linux.go
#	vendor/golang.org/x/sys/unix/zerrors_linux.go
#	vendor/golang.org/x/sys/unix/zsyscall_darwin_386.1_11.go
#	vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_11.go
#	vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.1_11.go
#	vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
#	vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
#	vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
#	vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
#	vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
#	vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
#	vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
#	vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
#	vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
#	vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
#	vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
#	vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
#	vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
#	vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
#	vendor/golang.org/x/sys/unix/ztypes_linux.go
#	vendor/gopkg.in/yaml.v3/.travis.yml
#	vendor/gopkg.in/yaml.v3/decode.go
#	vendor/gopkg.in/yaml.v3/emitterc.go
#	vendor/gopkg.in/yaml.v3/encode.go
#	vendor/gopkg.in/yaml.v3/parserc.go
#	vendor/gopkg.in/yaml.v3/scannerc.go
#	vendor/gopkg.in/yaml.v3/yaml.go
#	vendor/gopkg.in/yaml.v3/yamlh.go
#	vendor/modules.txt
@nkryuchkov nkryuchkov requested review from Darkren and jdknives and removed request for Darkren October 19, 2020 09:06
@nkryuchkov nkryuchkov merged commit dbec529 into master Oct 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants